Updates for new 'cops' from Rubocop

Minor source code changes to please Rubocop.