Using otf2-print wrapper in preparse and parse operations. Some minor code modification.