diff --git a/src/node/address.cc b/src/node/address.cc
index 93b2154c5..7bd6ce058 100644
--- a/src/node/address.cc
+++ b/src/node/address.cc
@@ -107,15 +107,7 @@ Address::Register (void)
   return type;
 }
 
-Address::Address (Attribute value)
-{
-  *this = ClassValueHelperExtractFrom<Address,AddressValue> (value);
-}
-Address::operator Attribute () const
-{
-  return ClassValueHelperConvertTo<Address,AddressValue> (this);
-}
-
+VALUE_HELPER_CPP (Address);
 
 bool operator == (const Address &a, const Address &b)
 {