Avoid redundant substitution