Refactoring to avoid overwriting #call.