See my reply in the current diff next to the TODO there.