Simplify some code.

This is just rename-keys