Updated to use ObjectIdentityComparator provided by Parity.