Mind opening an issue to point to these so we don't lose visibility on the TODO?