Added different substitution semantics.