Simplify NUL and queue handling