Fleshing out some more TODOs.