More rubocop cleanup.