more rejigging to satisfy xsd nagging