Function Call optimization is now optional

(Can cause a problem with package lookups)