Fixing mistakes in recent EntrywiseMap prototypes