This is just rename-keys
Merge pull request #54 from amalloy/perf

Simplify some code.