Clean up TODOs.

Also fix a test to explicitly pass.