Rearrange command line args