Stop wall creep

This is kind of a fake pull request. I did the same thing as TIM. I made some cool changes in a branch, and then when I was done with it I went and branched off it again without making a pull request. Then I forgot which of the many open branches that was. So anyway, this pull request rocks but also contains some code that doesn't do anything (that's how I roll).

I'm going to prune some of these branches later.