fix macros to clear state

Currently Macros don't clear the state of number mode, this needs to be fixed. The “work around” is to hit the inner thumb to generate the space after the macro as this then clears the number mode. Not a long term solution.