17: simplify substitutes