Tokenize input on ",".

  This updates #90.