Adding support for if/else and ternaries. Improving type name output.