Use vacuous schema for XML mode
Reorganise def_ps1