Fix C++11 TODOs.

And correct the mistakes of my (relative) youth.
Ooh, fancy!

Done.