Tweaks to remove a few Ruby 2.x-isms.