some simplifications in substitutability proof