Fix if_then_else expression generation
Fix type generation for raw strings