Removed duplicated code from stateful02. Extended existing parsers.