Move handling of UNARY_PLUS_EXPR to other conversion-expressions