Move to cmdargs more completely