Allow missing options, and fix matcher test.