Hm, I'm not sure there is a better way; maybe it would be better to add such a thing to the parser so that we're at least consistent.