[ refactor ] Typeclassified substExpr.
Merge branch 'maint-2.4.2'