Minor refactoring, also remove usage of 1.9 hashes

We still have to be sensitive to customers using old rubies.