eliminate use of the `XXX_draining macro