Rip off some counter-idiocy from the main tree, I'm not going to bother rebasing on them at this point, but I probably should've.