Remove a now unnecessary function since all calls have one version
and inline it into its caller.