Added built-in function names as identifiers and redefining (+)