[fix] Better command line handling.