Bug 6057 - Deprecate builtins that have been replaced by functions