diff --git a/Info/Layer3/Dell.pm b/Info/Layer3/Dell.pm
index fd1b7586..29c527f7 100644
--- a/Info/Layer3/Dell.pm
+++ b/Info/Layer3/Dell.pm
@@ -94,9 +94,6 @@ $VERSION = '1.05';
             # RADLAN-HWENVIROMENT:rlEnvMonFanStatusTable
             'dell_fan_state' => 'rlEnvMonFanState',
             'dell_fan_desc'  => 'rlEnvMonFanStatusDescr',
-            # Normal BRIDGE-MIB not working?  Use Q-BRIDGE-MIB for macsuck
-            'fw_mac'    => 'qb_fw_mac',
-            'fw_port'   => 'qb_fw_port',
            );
 
 
@@ -185,6 +182,21 @@ sub i_duplex_admin {
     return \%i_duplex_admin;
 }
 
+# Normal BRIDGE-MIB not working?  Use Q-BRIDGE-MIB for macsuck
+sub fw_mac {
+    my $dell = shift;
+    my $partial = shift;
+
+    return $dell->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $dell = shift;
+    my $partial = shift;
+
+    return $dell->qb_fw_port($partial);
+}
+
 1;
 __END__
 
diff --git a/Info/Layer3/Enterasys.pm b/Info/Layer3/Enterasys.pm
index f43a6b18..3918e864 100644
--- a/Info/Layer3/Enterasys.pm
+++ b/Info/Layer3/Enterasys.pm
@@ -64,10 +64,6 @@ $VERSION = '1.05';
             %SNMP::Info::CDP::FUNCS,
             %SNMP::Info::LLDP::FUNCS,
             %SNMP::Info::MAU::FUNCS,
-            # Normal BRIDGE-MIB has issues on some devices, duplicates and
-            # non-increasing oids, Use Q-BRIDGE-MIB for macsuck
-            'fw_mac'    => 'qb_fw_mac',
-            'fw_port'   => 'qb_fw_port',
            );
 
 %MUNGE = (
@@ -155,6 +151,22 @@ sub i_duplex_admin {
     return $enterasys->mau_i_duplex_admin($partial);
 }
 
+# Normal BRIDGE-MIB has issues on some devices, duplicates and
+# non-increasing oids, Use Q-BRIDGE-MIB for macsuck
+sub fw_mac {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    return $enterasys->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    return $enterasys->qb_fw_port($partial);
+}
+
 #  Use CDP and/or LLDP
 
 sub hasCDP {