Update cli modules for better visibility into command line options and arguments.