Issue #28 work. Legacy parser now converted and compiles, untested.