More minor refactoring of TODO.