Fix linting errors

Now that the integration tests have landed in the `develop` branch, spanning refactorings like this can be tested in an automated fashion. Because the tests continue to pass and because the changes themselves rarely describe functional changes, I'm reasonably confident that this work does not introduce any regressions. That said, I would certainly appreciate a code review :)