Idiomatic Ruby

Assuming this gets accepted, this should [FixRM #8240]. Take a look, and
if you're good with it, I'll land on master. Everything seems to work
out on this end.
Merge remote-tracking branch 'todb/land-2414' into migrate_close_channels