Merge "Clean up TODOs in the new subsystem."