Do not check 'entity_type' twice in preprocess