Fix C++11 TODOs.

And correct the mistakes of my (relative) youth.
Can kill the annoying space between >> (without doubt the /best/ feature of C++11 :)