Add full support for enter_s and leave_s mnemonics