Remove WQ_PRIV macros - not strictly necessary