Split up CLI#run a bit