Fix issues with command line parsing and specific versions of the STL.