Nice catch (pun intended)--you've clearly given this utility method a lot of thought, We just need a unit test for this functionality.