Massive Ruby syntax cleanup.

We now don't have any Rubocop warnings, and this fixed at least
one bug.