Merge changes I516c984b,I2b3354de

* changes:
  comment on how glob files are written
  cosmetic: use map[_]struct{}  for set semantics