They aren't exposed today, so there is no "keep them". I would like this refactor not to functionally change anything if we can avoid it.