Move the last of the functions out of the global name space.