Comment 9 for bug 665667

This is a patch against the tip. It addresses all previous comments:
 - reduces wasted space
 - works faster
 - less intrusive for the code

David's suggestion seems odd to me. Exactly how one attaches the license to a patch? It's a 20-liner anyway, just do whatever with it. MIT - sure, fine by me.