Recent threading changes have broken both of these. They will be fixed
in a separate pull request. Also added new CmdLineOptParser.cc/h