A bit of code quality cleanup.