VectorClock and UniqueAddress changes and optimizations based on feedback. See #3441