(Another) minor refactoring of substitutions