Generalize disable fields
And tweak isAnyDiff...