Oops, my last email came back undeliverable to the bug tracker
address. Not sure why.

As a summary, just in case this one manages to get through, the new
patch addresses the issues Nicolas brought up, and I confirmed with
Aston Roberts, the OTS maintainer, that everything is released under
GPL. Here's the patch again, again just in case it gets through.