Fix a bug with being inconsistent with how we make substitutions.