Partially reverts 36393625. Too much unparsing is not good for you.
Merge branch 'master' of github.com:cwi-swat/rascal