Added unary plus operator

And fixed FunctionCall replace in the process.