This comment (and other TODOs sprinkled in) concern me. Perhaps track them all in a BZ or github issue? Would be good to at least have a searchable way to see all the related gaps.