Cleanup previous EntityIdParser cleanup

This fixes some minor details introduced in Ie6cc3dd.

Change-Id: Ib3565635f0e5d86b51b36a1dd409cc1c36d44d6e
Merge "Cleanup previous EntityIdParser cleanup"