Make the parser smater

[densizengin]

This require better knowledge than I posses at this very moment, but a book about parsers should allow me to conduct one fairly easily. The time is the essence here.

I should mention that, if you have a look at the tests, you'll see that the parser is smart enough already.