Make XML production simpler