Minor refactoring such that when locking, we provide the call being made