A simply yet a very nice fix to have on the mess that is SMW. Nice work.
Just a minor complaint (and this applies to the majority of ASMers), try to use JML hijacks whenever possible instead of JSL. The reason is that in certain occasions, it is possible to save up a couple of cycles, increasing efficiency.
Edit: Also, I made it SA-1 compatible, just for the sake of it.