Both cells and controls can have tags in IB, control tag should take precedence

AppKit/CPView.j

@@ -2907,6 +2907,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
 
         [self _setupToolTipHandlers];
         _toolTip = [aCoder decodeObjectForKey:CPViewToolTipKey];
+
         if (_toolTip)
             [self _installToolTipEventHandlers];
 

Tools/nib2cib/NSButton.j

@@ -269,8 +269,6 @@ var NSButtonIsBorderedMask = 0x00800000,
     _highlightsBy = [cell highlightsBy];
     _showsStateBy = [cell showsStateBy];
 
-    [self setTag:[cell tag]];
-
     return self;
 }
 

Tools/nib2cib/NSControl.j

@@ -56,6 +56,11 @@
         [self setLineBreakMode:[cell lineBreakMode]];
 
         [self setFormatter:[cell formatter]];
+
+        // In IB, both cells and controls can have tags.
+        // If the control has a tag, that takes precedence.
+        if ([aCoder containsValueForKey:@"NSTag"])
+            [self setTag:[aCoder decodeIntForKey:@"NSTag"]];
     }
 
     return self;