Improve dita command argument parsing