An attempt to refine the spec to handle repeated values.  For discussion tomorrow.