Added missing quotes around variable name in output.
Fixed issue with getting a function name that is a token instead of an identifier chain.
Updated more output to use same single quote style.