Minor refactoring of *all the things*.