jgm Factor out deleteSubstitutedVariables.