Add some TODOs intended for the previous commit.