InfiniteSilence:

Thanks for taking the time to look at it! Actually, I was hoping for feedback from someone who had already taken the time and/or implemented it, as the codebase is far too large for a really thorough review on such short notice.

Still, your comments are helpful. I'd say I was just going to add my own -T, but we'll have to see if that breaks anything or not (if we decide to use it).