Typo in fcmp printing (icmp was printed).
expr, expr_unit, terminator, teminator_unit and instr types merged
into a new instr type.
Merge branch 'master' into packaging
Merge branch 'type-refactoring' into packaging