They need cleanup throughout (including the tag shell helpers that are now aliases).
backport through 3.6