fix rubocop issues.

newer rubocop found new things.
Since none of the files hit by this overlap with Tom's bigger change, I figured it was safe to go ahead and do this.