Fix C++11 TODOs.

And correct the mistakes of my (relative) youth.
Sure (maybe it's just me that it bugs then :))