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 :(
Yes, but we don't write code to make linters happy, we write the software to solve a problem. The easier that software can be understood by the maintainers, the better. Believe me, I'm all for consistency, you'll never get a bad word from me about having a consistent style. Obeying a style guide that itself is not consistent is a little bit backwards. To me.