Rubocop Updates

A recent upgrade to Rubocop caused a number of new failures.  This
change fixes those failures.