56375826 questionable refactorings

I believe this refactoring is worth doing. Tests all pass.