I'm glad you included this, as I'd never seen this before. There's a lot in here that I want to change.

That's unrelated to this patch though.