Handle embeddef ield types correctly