Fix handling of optional arguments in cmti files