Handle interpreter messages more flexibly #50
Merge pull request #53 from jonas054/bugfix2

Bail out if we can't find a "when ... ;" due to lack of tokens.
Handle extra comma at end of argument list without crashing.