Fix up imported function references, standardizing on how symbols are references - through the context