minor clean-up of Substitution