some more cleanup in FieldItem