mark _DiffOf_XXX etc for refactoring