Command line arg processing fix (Bug#5392)