maybe we could do this in a separate PR (and keep this one about the parser), care to file an issue?