Minor refactoring.
Added a TODO.