Rubocop issues

I've discovered a couple of shortfalls in the Rubocop and the GDS Rubocop config that enforce rules in unexpected ways. See individual commit messages for details.