Removed 2 calls to cCode.appendDecl in walkCondExpr, replaced with ostringstream usage + 1 call to cCode.appendDecl Created Type helper class = TypeContainer