Better parsing of statement lists

These commits fix the issue described in #7.
It was a real pain to modify this grammar correctly, but I finally managed to get a grammar with even less shift/reduce conflicts as before :)