Simplify enqueue logic