Fixed a couple bugs with some builtin functions being extrapolated from some dictionaries.