implemented a statement reparsing mechanism, fixed-form do test now passes