Minor refactoring, because naming things at 3am is a bad idea.