clean up SystemDefChoice, fix dependency on core.xml