Put macros in the `q` register instead
Add surround mapping for single quote