Improve IfExpressionFormatter