Jonathan Sidi replace quo_expr with quo_squash