Okay, I'll merge this in mostly because I want to get this issue closed. For future reference, refactoring to me includes "making it correct", not just rearranging and so I would not consider throwing an error to be an appropriate refactor.