Minor improvement in comment and TODO.