Reduce number of "new EntityId( ... )" constructor calls

These few tiny changes should not have any impact on what the code
and the tests do.

Change-Id: I59146eed52affa106b80205b38b6775ce960a264