mwf: minor parser improvements