Add a few more TODOs.