In fix handling of empty values

A different approach is needed because this operator is currently always going to be used in conjunction with Constraint, etc., which automatically appends the field name...