ws, enumify XHRTargetTypeId and the like