Yet another step to generalized substitution optimization.