Deprecated the tangled one-factor fast implementation of substitution
Fixed the unfaithful implementation of strict normalization strategies