Fix C++11 TODOs.

And correct the mistakes of my (relative) youth.
I didn't tweak my ```.clang-format``` file yet. :smiley:

Maybe do it later, with another run of ```clang-format```, once I figure out how to make to do?