Minor update to the generation of entity predicate definition tables