Let's remove this todo. I don't think we should hint at deprecating this - it's the proper concept and nomenclature here.