Added a TODO.
Simplification.