Improve check_number_of_calls family of methods
Improve debuggability when call-count numbers don't match up