Improved handling of CLI parameters.