Clear up some no-longer-applicable TODOs