Fix issue with in-order parsing of cli task options