mwf: parser improvements