Add a TODO for a future code refactoring.

Test Plan:
- none