If you check for `q` here and exit macro mode, you can return and not have to swap out `q` from the keymap, or discard the last character in the `keyBuffer`.