Improved match-syntax, and-syntax, or-syntax