Cleanup: most TODOs fixed.