diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java
index 2ede92a75..cc582a358 100644
--- a/core/java/src/net/i2p/data/RouterAddress.java
+++ b/core/java/src/net/i2p/data/RouterAddress.java
@@ -126,7 +126,7 @@ public class RouterAddress extends DataStructureImpl {
     public boolean equals(Object object) {
         if ((object == null) || !(object instanceof RouterAddress)) return false;
         RouterAddress addr = (RouterAddress) object;
-        return DataHelper.eq(_cost, addr.getCost()) && DataHelper.eq(_expiration, addr.getExpiration())
+        return _cost == addr.getCost() && DataHelper.eq(_expiration, addr.getExpiration())
                && DataHelper.eq(_options, addr.getOptions())
                && DataHelper.eq(_transportStyle, addr.getTransportStyle());
     }
diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java
index 20de623e8..9968a324d 100644
--- a/core/java/src/net/i2p/data/RouterInfo.java
+++ b/core/java/src/net/i2p/data/RouterInfo.java
@@ -560,7 +560,7 @@ public class RouterInfo extends DataStructureImpl {
         RouterInfo info = (RouterInfo) object;
         return DataHelper.eq(_identity, info.getIdentity())
                && DataHelper.eq(_signature, info.getSignature())
-               && DataHelper.eq(_published, info.getPublished())
+               && _published == info.getPublished()
                && DataHelper.eq(_addresses, info.getAddresses())
                && DataHelper.eq(_options, info.getOptions()) 
                && DataHelper.eq(_peers, info.getPeers());
diff --git a/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java b/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java
index 0bdc4805c..69cba7d24 100644
--- a/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java
+++ b/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java
@@ -51,7 +51,7 @@ public class AbuseSeverity extends DataStructureImpl {
     @Override
     public boolean equals(Object object) {
         if ((object == null) || !(object instanceof AbuseSeverity)) return false;
-        return DataHelper.eq(getSeverity(), ((AbuseSeverity) object).getSeverity());
+        return _severityId == ((AbuseSeverity) object).getSeverity();
     }
 
     @Override
diff --git a/core/java/src/net/i2p/data/i2cp/MessageId.java b/core/java/src/net/i2p/data/i2cp/MessageId.java
index 84bfa0dfe..d1db73761 100644
--- a/core/java/src/net/i2p/data/i2cp/MessageId.java
+++ b/core/java/src/net/i2p/data/i2cp/MessageId.java
@@ -53,7 +53,7 @@ public class MessageId extends DataStructureImpl {
     @Override
     public boolean equals(Object object) {
         if ((object == null) || !(object instanceof MessageId)) return false;
-        return DataHelper.eq(getMessageId(), ((MessageId) object).getMessageId());
+        return _messageId == ((MessageId) object).getMessageId();
     }
 
     @Override
diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
index fd0327d1c..6c041f11c 100644
--- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
@@ -112,8 +112,8 @@ public class MessagePayloadMessage extends I2CPMessageImpl {
     public boolean equals(Object object) {
         if ((object != null) && (object instanceof MessagePayloadMessage)) {
             MessagePayloadMessage msg = (MessagePayloadMessage) object;
-            return DataHelper.eq(getSessionId(), msg.getSessionId())
-                   && DataHelper.eq(getMessageId(), msg.getMessageId())
+            return _sessionId == msg.getSessionId()
+                   && _messageId == msg.getMessageId()
                    && DataHelper.eq(getPayload(), msg.getPayload());
         }
             
diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
index b246aadb4..67fde8134 100644
--- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
@@ -157,9 +157,9 @@ public class MessageStatusMessage extends I2CPMessageImpl {
     public boolean equals(Object object) {
         if ((object != null) && (object instanceof MessageStatusMessage)) {
             MessageStatusMessage msg = (MessageStatusMessage) object;
-            return DataHelper.eq(getSessionId(), msg.getSessionId())
-                   && DataHelper.eq(getMessageId(), msg.getMessageId()) && (getNonce() == msg.getNonce())
-                   && DataHelper.eq(getSize(), msg.getSize()) && DataHelper.eq(getStatus(), msg.getStatus());
+            return _sessionId == msg.getSessionId()
+                   && _messageId == msg.getMessageId() && _nonce == msg.getNonce()
+                   && _size == msg.getSize() && _status == msg.getStatus();
         }
             
         return false;
diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
index 8c6e0b2f1..6ad5e2745 100644
--- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
@@ -92,8 +92,8 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl {
     public boolean equals(Object object) {
         if ((object != null) && (object instanceof ReceiveMessageBeginMessage)) {
             ReceiveMessageBeginMessage msg = (ReceiveMessageBeginMessage) object;
-            return DataHelper.eq(getSessionId(), msg.getSessionId())
-                   && DataHelper.eq(getMessageId(), msg.getMessageId());
+            return _sessionId == msg.getSessionId()
+                   && _messageId == msg.getMessageId();
         }
             
         return false;
diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java
index cf1325cc8..79cf88382 100644
--- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java
@@ -76,8 +76,8 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl {
     public boolean equals(Object object) {
         if ((object != null) && (object instanceof ReceiveMessageEndMessage)) {
             ReceiveMessageEndMessage msg = (ReceiveMessageEndMessage) object;
-            return DataHelper.eq(getSessionId(), msg.getSessionId())
-                   && DataHelper.eq(getMessageId(), msg.getMessageId());
+            return _sessionId == msg.getSessionId()
+                   && _messageId == msg.getMessageId();
         }
          
         return false;
diff --git a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
index 490e7e426..dab34ed43 100644
--- a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java
@@ -87,7 +87,7 @@ public class SessionStatusMessage extends I2CPMessageImpl {
     public boolean equals(Object object) {
         if ((object != null) && (object instanceof SessionStatusMessage)) {
             SessionStatusMessage msg = (SessionStatusMessage) object;
-            return DataHelper.eq(getSessionId(), msg.getSessionId()) && DataHelper.eq(getStatus(), msg.getStatus());
+            return DataHelper.eq(getSessionId(), msg.getSessionId()) && _status == msg.getStatus();
         }
          
         return false;
diff --git a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java
index 17a81ec09..1e90ec716 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java
@@ -247,7 +247,7 @@ public class DatabaseStoreMessage extends I2NPMessageImpl {
             return DataHelper.eq(getKey(),msg.getKey()) &&
                    DataHelper.eq(getLeaseSet(),msg.getLeaseSet()) &&
                    DataHelper.eq(getRouterInfo(),msg.getRouterInfo()) &&
-                   DataHelper.eq(getValueType(),msg.getValueType()) &&
+                   _type == msg.getValueType() &&
                    getReplyToken() == msg.getReplyToken() &&
                    DataHelper.eq(getReplyTunnel(), msg.getReplyTunnel()) &&
                    DataHelper.eq(getReplyGateway(), msg.getReplyGateway());
diff --git a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java
index e04d6e642..63cb924b0 100644
--- a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java
@@ -71,8 +71,8 @@ public class DeliveryStatusMessage extends I2NPMessageImpl {
     public boolean equals(Object object) {
         if ( (object != null) && (object instanceof DeliveryStatusMessage) ) {
             DeliveryStatusMessage msg = (DeliveryStatusMessage)object;
-            return DataHelper.eq(getMessageId(),msg.getMessageId()) &&
-                   DataHelper.eq(getArrival(),msg.getArrival());
+            return _id == msg.getMessageId() &&
+                   _arrival == msg.getArrival();
         } else {
             return false;
         }
diff --git a/router/java/src/net/i2p/data/i2np/GarlicClove.java b/router/java/src/net/i2p/data/i2np/GarlicClove.java
index 867071c86..b9bc3d4e7 100644
--- a/router/java/src/net/i2p/data/i2np/GarlicClove.java
+++ b/router/java/src/net/i2p/data/i2np/GarlicClove.java
@@ -193,7 +193,7 @@ public class GarlicClove extends DataStructureImpl {
             return false;
         GarlicClove clove = (GarlicClove)obj;
         return DataHelper.eq(getCertificate(), clove.getCertificate()) &&
-               DataHelper.eq(getCloveId(), clove.getCloveId()) &&
+               _cloveId == clove.getCloveId() &&
                DataHelper.eq(getData(), clove.getData()) &&
                DataHelper.eq(getExpiration(), clove.getExpiration()) &&
                DataHelper.eq(getInstructions(),  clove.getInstructions());
diff --git a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java
index 70876ea64..1ac01d0a6 100644
--- a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java
+++ b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java
@@ -197,7 +197,7 @@ public class TunnelDataMessage extends I2NPMessageImpl {
     public boolean equals(Object object) {
         if ( (object != null) && (object instanceof TunnelDataMessage) ) {
             TunnelDataMessage msg = (TunnelDataMessage)object;
-            return DataHelper.eq(getTunnelId(),msg.getTunnelId()) &&
+            return _tunnelId == msg.getTunnelId() &&
                    DataHelper.eq(getData(),msg.getData());
         } else {
             return false;