Fix #14. Remove further uses of EntityList

It's almost like I didn't fully test my changes before committing!