Fixes some relatively minor Rubocop issues, with a view to eventually enforcing the project's config.