Now setting "matched" attribute flags on appropriate <configuration> elements. And some cleanup. Refs #519, #710