Banish the word 'echo'
Fix match_at_least_one
Improve notation