These four changes in this file have nothing to do with this commit, but they broke my build on Ubuntu 12.10. Sorry for including them here.