In the spirit of the Programmers' Third Virtue, I figured I could do better than that. As it turns out, technically I can, but it
really wasn't worth the trouble: as of v1.14, your patch suffices for everything except two lines in the script, perhaps neither of which most players will ever see.
The attached patch fixes those two places anyway, and (if we are a certain kind of fortunate) may also fix others which have yet to be written.
(Place this file directly in the
game/
folder to apply it.)
Changelog: