Get rid of SchemaSet and just use definitions in an outer schema.