eliminate last uses of field-value