It did some weird things to my code, making it not compile, so I'm
checking in a version I just fixed.