Split out key bindings.
Migrate more defuns.