Fix subst-all contract.