Reorg arguments as per xctool spec