GR-30, types update rules

Not for merge, just comments
Introduction of the `cb` local variable (and subsequent use on the next line) makes this code harder to read. Better to just use `entity_type.created_by` twice.