slight cleanup of EntityIdentifier.cpp