Clear 'z' register before and after the macro
Fix mappings that do not work with non-recursive