Issue #1874300 by Berdir, swentel: Remove $entity_type argument from field.module functions that receive a single $entity.