Move TODOs around.