Cleanup queue code more, parent-id is going to take more thinking...