Get to 99% mutation coverage, fix a bug with Foo|Bar matching