Renamed command-line param short forms, moved cl parse to main.