Try to avoid line wrapping for short choices in matching
Merge branch 'master' of github.com:drlippman/IMathAS