Further simplifications of StructureMatcher code.