Improve the way the command line is passed around during initialization.