More rubocop fixes.