PBP always return via an explicit return

Info/Layer3/C3550.pm

@@ -211,12 +211,12 @@ sub set_i_duplex_admin {
        return $c3550->set_p_duplex($duplexes{$duplex}, $iid);
     }
     else {
-        $c3550->SUPER::set_i_duplex_admin;
+        return $c3550->SUPER::set_i_duplex_admin;
     }
 }
 
 sub cisco_comm_indexing {
-    1;
+    return 1;
 }
 
 1;

Info/Layer3/C4000.pm

@@ -119,10 +119,10 @@ sub fan {
 	$s = ", ";
     }
     return if ($s eq "");
-    $ret;
+    return $ret;
 }
 
-sub cisco_comm_indexing { 1; }
+sub cisco_comm_indexing { return 1; }
 
 1;
 __END__

Info/Layer3/C6500.pm

@@ -108,7 +108,7 @@ sub vendor {
     return 'cisco';
 }
 
-sub cisco_comm_indexing { 1; }
+sub cisco_comm_indexing { return 1; }
 
 #  Newer versions use the ETHERLIKE-MIB to report operational duplex.
 
@@ -188,7 +188,7 @@ sub set_i_duplex_admin {
        return $c6500->set_p_duplex($duplexes{$duplex}, $iid);
     }
     else {
-        $c6500->SUPER::set_i_duplex_admin;
+        return $c6500->SUPER::set_i_duplex_admin;
     }
 }
 

Info/Layer3/Cisco.pm

@@ -122,7 +122,7 @@ sub i_vlan {
 			}
 		}
 	}
-	\%i_vlan;
+	return \%i_vlan;
 }
 
 1;

Info/Layer3/Extreme.pm

@@ -223,7 +223,7 @@ sub fan {
         $s = ", ";
     }
     return if ($s eq "");
-    $ret;
+    return $ret;
 }
 
 # Newer versions of the Extreme firmware have vendor-specific tables
@@ -291,7 +291,7 @@ sub _if2tag {
             $if2tag{$if} = -$global_id->{$if} if ($if2tag{$if} == -1 && defined($global_id->{$if}));
         }
     }
-    \%if2tag;
+    return \%if2tag;
 }
 
 # No partial support in v_name or v_index, because the obivous partial

Info/Layer3/Juniper.pm

@@ -117,7 +117,7 @@ sub i_vlan {
 			}
 		}
 	}
-	\%i_vlan;
+	return \%i_vlan;
 }
 
 1;

Info/Layer3/N1600.pm

@@ -71,8 +71,6 @@ $VERSION = '1.09';
 
 # Method OverRides
 
-sub bulkwalk_no { 1; }
-
 sub model {
     my $n1600 = shift;
     my $id = $n1600->id();