Small cleanup of CallSite API.