Make command line more robust.