Some TODOs. We're almost there!

@TiarkRompf -- Do you agree that the TODO I am not sure about is weird,
or not?