Remove some redundancy from collection.xconf schema.