#1772: Small refactor of the SchemaCreator to avoid generating duplicate schemas when non-strict matching is used.