More work on CLIParser.rb