Add some more correctness checking for EntityList.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>