Alphabetized additions and fixup List matcher

Sorry didn't catch the alphabetization 1st time.

Also, the list matcher was too aggressive.