I know we've talked this over in person a bit and there is clear (albeit unusual) edge case that, from what I can tell, already existed prior to this round of changes.

Should we work on getting this in, or should we try to fix it here (I'm for deferring to a subsequent, clearly scoped, follow up pull req.)?