Temporary patch; fix Shift bindings and other autocmds later