[jkman]

I mean, adding some shotgun changes to a messy codebase is always significantly easier than refactoring the whole.