Dammit. I'll add this to a test somewhere. Refactoring without enough tests sucks.