I thought as much. We can't deprecate them without having an alternative, but it may then be useful to create a separate issue to factor them out.