> and the refactoring I suggested seems like an obvious one that any next guy who comes along might do and break your case.

This is a fair point, I can add a comment mentioning this and pointing to the discussion. Seriously, adding test cases for these kind of corner cases would be extremely time consuming, is killing a fly with a bazooka.