--- MIME-Lite-3.01/lib/MIME/Lite.pm-	2006-08-27 15:30:07 +0000
+++ MIME-Lite-3.01/lib/MIME/Lite.pm	2006-08-27 15:31:44 +0000
@@ -409,14 +409,16 @@ my @FieldOrder;
 
 ### See if we have File::Basename
 my $HaveFileBasename = 0;
-if (eval "require File::Basename") { # not affected by $PARANOID, core Perl
+if (require File::Basename) { # not affected by $PARANOID, core Perl
   $HaveFileBasename = 1;
   push @Uses, "F$File::Basename::VERSION";
 }
 
 ### See if we have/want MIME::Types
 my $HaveMimeTypes=0;
-if (!$PARANOID and eval "require MIME::Types; MIME::Types->VERSION(1.004);") {
+if (!$PARANOID) {
+  require MIME::Types;
+  MIME::Types->VERSION(1.004);
   $HaveMimeTypes = 1;
   push @Uses, "T$MIME::Types::VERSION";
 }
@@ -507,20 +509,15 @@ sub my_extract_addrs {
     return @addrs;
 }
 
-if (eval "require Mail::Address") {
+if (!$PARANOID) {
+    require Mail::Address;
     push @Uses, "A$Mail::Address::VERSION";
-    eval q{
-	sub extract_addrs {
+    *extract_addrs = sub {
 	    return map { $_->address } Mail::Address->parse($_[0]);
-	}
-    }; ### q
+    };
 }
 else {
-    eval q{
-        sub extract_addrs {
-	    return my_extract_addrs(@_);
-	}
-    }; ### q
+    *extract_addrs = \&my_extract_addrs;
 } ### if
 
 
@@ -537,13 +534,13 @@ else {
 # Encode the given string using BASE64.
 # Unless paranoid, we try to load the real code before supplying our own.
 
-if (!$PARANOID and eval "require MIME::Base64") {
+if (!$PARANOID) {
+    require MIME::Base64;
     import MIME::Base64 qw(encode_base64);
     push @Uses, "B$MIME::Base64::VERSION";
 }
 else {
-    eval q{
-sub encode_base64 {
+*encode_base64 = sub {
     my $res = "";
     my $eol = "\n";
 
@@ -562,7 +559,6 @@ sub encode_base64 {
     $res =~ s/(.{1,76})/$1$eol/g if (length $eol);
     return $res;
 } ### sub
-  } ### q
 } ### if
 
 #------------------------------
@@ -576,13 +572,13 @@ sub encode_base64 {
 #
 # Unless paranoid, we try to load the real code before supplying our own.
 
-if (!$PARANOID and eval "require MIME::QuotedPrint") {
+if (!$PARANOID) {
+    require MIME::QuotedPrint;
     import MIME::QuotedPrint qw(encode_qp);
     push @Uses, "Q$MIME::QuotedPrint::VERSION";
 }
 else {
-    eval q{
-sub encode_qp {
+*encode_qp = sub {
     my $res = shift;
     local($_);
     $res =~ s/([^ \t\n!-<>-~])/sprintf("=%02X", ord($1))/eg;  ### rule #2,#3
@@ -597,7 +593,6 @@ sub encode_qp {
     $brokenlines =~ s/=\n$// unless length $res;
     "$brokenlines$res";
 } ### sub
-  } ### q
 } ### if