I am happy to revert this bit as it doesn't really seem necessary, but ugh, that code is ugly and should be refactored :-). Would you like me to?