Fix more Rubocop issues
Fixes some Rubocop errors, including some recently added ones.
I've disabled RSpec/MultipleMemoizedHelpers
, which appeared in the project for the first time.
@axil, I'll send straight to you for merge, and just CC @ashmckenzie and @.luke who can object after the fact if necessary