Reorder diff_opt_parse options more logically per topics.