I still don't understand why my suggestion won't work. Are these cases in the test suite? If so, it's easier to agree that anything not in the test suite may break and I might try to refactor the code later.