Refactored identities and assertions.