On the bright side, you've now successfully wormed out several corner cases we never imagined in one CR!