Cleaning up some old TODOs that are already fixed, and also fixing smaller TODOs.