Rubocop fixes

Bad development practices led me to commit code without first running
the entire rake suite.  This fixes the problems introduced in the last
commit.

[#59134502]
Merge 59134502-rubocop to master

[#59134502]