Add more explicit assertion
Have Extra match last, if nothing else matched