Remove unnecessary complexity in FieldValueCounterHandler