Adjust for internal_function_def removal.
18 files changed