Grapher, val will collapse variables when they shouldn't

Both assume that `funcfind` won't ever collapse, which is false, since `funcfind` will call `calc` when it finds a string that isn't a variable. A new method is needed that will do `funcfind` without collapsing variables; `funcfind` itself should not be changed.