record-calls refactoring.