Remove fixed @todos.

As @wlcx pointed out, these are now done.
Use @todo for doc-block TODO.

The TODO in that doc block gave @LordAro a coronary.