Merge "endpoint identifiers: Some code cleanup."