Updating: improving ccomp-subst-primdec.