Cleaned up methods to create entity ids from JSON (part 2)

I forgot two methods in the earlier commit.