Improved support for Ctrl-mappings