Improve convert command line handling