Consolidate pspUmdError/pspUmdType to header