minor cleanup to structure matcher