Fix to handling of command line args.
Build path consolidation.