Fix C++11 TODOs.

And correct the mistakes of my (relative) youth.
Done (but it's "to jump through", not "to jumping through").