decouple queue management a bit.