More rubocop changes.