feature #2858: Better check for class types. Single AR addtion to prevent out-of-sync NETs