prov/psm: tagged_inject optimization, plus some minor fixes