Fix C++11 TODOs.

And correct the mistakes of my (relative) youth.
It bugs me too, you can be sure that you won't see me doing "> >" anymore!