Added variable equality substitutions back in addition to condition substitution.