Modify simple-infix in preperation for more alebraic simplification