Fix C++11 TODOs.

And correct the mistakes of my (relative) youth.
ya, but I snuck in two grammar mods there with the intention of ending up with:
"...but it required jumping through.."