Unify command line handling of MCTargetOptions and remove extra