--- Net-SNMP-XS/XS.pm	2009/04/12 00:48:39	1.9
+++ Net-SNMP-XS/XS.pm	2018/12/21 11:21:06	1.16
@@ -43,10 +43,7 @@
 
 package Net::SNMP::XS;
 
-use strict qw(vars subs);
-no warnings;
-
-use Guard;
+use common::sense;
 
 use Net::SNMP ();
 use Net::SNMP::PDU ();
@@ -54,26 +51,15 @@
 use Net::SNMP::MessageProcessing ();
 
 our $VERSION;
-our $old_prepare;
 
 BEGIN {
-   $VERSION = '0.03';
-
-   $old_prepare = \&Net::SNMP::MessageProcessing::prepare_data_elements;
+   $VERSION = 1.32;
 
-   # this overrides many methods inside
+   # this overrides many methods inside Net::SNMP and it's submodules
    require XSLoader;
    XSLoader::load Net::SNMP::XS, $VERSION;
 }
 
-sub Net::SNMP::MessageProcessing::prepare_data_elements {
-   my ($self, $msg) = @_;
-
-   set_msg $msg, $msg->{_buffer};
-   scope_guard \&clr_msg;
-   &$old_prepare
-}
-
 package Net::SNMP::Message;
 
 Net::SNMP::XS::set_type INTEGER          , \&_process_integer32;
@@ -102,7 +88,7 @@
 
 package Net::SNMP::PDU;
 
-# var_bind_list hardcodes oid_lext_sort. *sigh*
+# var_bind_list hardcodes oid_lex_sort. *sigh*
 # we copy it 1:1, except for using oid_lex_sort.
 
 sub var_bind_list