Simplify EntityId class further
Merge pull request #228 from wmde/entityid20

Simplify EntityId class further