Updated self-references.