Simplified and speedier 'improved buff' check.