Fixed problem if initial values are calculated based on a function with
constant arguments.
Fixed problem with quoting of function names which are reserved keywords.