More renaming 'closure' to 'function'