Minor tweaks to close handling of write queue.