Improve task queue to handle just argument and a default task