Big optimization on command line handling