[sr-dev] git:master:727b5c5f: dmq: use core fixup helper functions directly