* commit '97175deb446cdaca7f3910b71940cb443bda3cc4': Clean up argc / argv processing for runtime args.