where using a std::map instead of a std::set meant that it
sometimes miscounted the number of callsites

Change-Id: I1e2ebcf44fe006827e66620ae4c9bbc813835414