Moved some function pointer typedefs to narrower scopes.