Minor tweaks to support queue expire.