Don't use the Hash constructor if there's only one field
Merge branch 'obrok/hash-constructor'