Fixed AddressState.
Cleaned up macro hashCodeBody().