Fixups for rubocop complaints.

This should fix up the current rubocop complaints.