Appropriately typedef call site function pointers
Merge remote-tracking branch 'ryoqun/call-site-typedef'