Added some comments on callsite for PR #581