Fix cluster list generation. (#955)

* "clusterSize:" had a stray ':' that was causing generation to produce invalid
  output.
* The old code had things indented sanely, and this is just restoring that.
* There was no detection of unknown tokens, which would have quickly caught the
  "clusterSize" problem.