Updating: improving ccomp-primdec-subst.