More rubocop

@localshred follow up from the last PR. This gets us nearly all the way to rubocop-completeness, but more importantly, it makes the tests run again, which I broke in the last PR :(
I shake my head even making this comment, but removing all of these empty lines (not just this file, but in the whole diff) bugs me. Compacted code is rarely readable code.