Question

Editing MW so that unblock = change block to 0 would solve this, I guess, but may be way too much hassle.

We don't want to edit MW, maintaining a patch is too much work.

Do it properly and you can upstream your patch.

Been there, done that, getting a simple patch for an actual bug upstreamed takes forever, can't be bothered.