The attached patch adds a variable to let you fix key bindings.  It
also provides comments for 2 places where there were compiler
warnings.