Replace a obscure TODO with explicit ones.
Merge branch 'readme/todo-impl-fix'