Clean up some Rubocop warnings that were previously suppressed.