am 62bab313: Fixing handling of single-item data kinds.

* commit '62bab31374dd66462643cbc04ebb2acece4b9b39':
  Fixing handling of single-item data kinds.