It now deals (more) gracefully with more complicated key bindings.