Updating internal cmdline handling.