No need to comment this; it's not a public-facing thing. Awesome patch, otherwise! I'll merge it and fix up.