Minor refactoring.
Adding another TODO.