Fix style violations in most recent Rubocop