More simplification of xml->ddl