Cleaning up odds and ends.

Also known as "remember the difference between running `rake` and
`bundle exec rake`".

RSpec: 20 examples, 0 failures
RuboCop: 11 files inspected, no offences detected