Fixed up mkHandleInput in cli.js