Don't split everything by entity type.