Don't close layout with commas when not in an explicit block

  Fixes #110