and BTW: this PR can't be merged at the moment anyway, as the old parser needs to be removed first ;)