Rubocop again

Like #83, but with self-contained commits for each cop.