Followup tidyup of EntityIdParser

Change-Id: I4c0ec1c85ab06543e6209ab1b125aebb8ddbfed6