rpearce/tdenley: Swap args to prevent silly race condition with refstack