Several bugfixes in the syntax.