Improvements in the substitutability lemma.