More xml madness to cover up for...