Fix comments per added todos from personal branch. (trivial)