Rubocop polishing

The recent upgrade of Rubocop caused some build failures.  This change
fixes those problems.