Fix a few Rubocop style warnings.

I fixed a number of RuboCop style warnings.  No functional changes, and the specs are all green.