Revise name and interface of new utility routines to match work already
in place on the trunk.