diff_filespec: reorder dirty_submodule macro definitions