Cleanup StructureMatcher a bit more.