More tweaks around method call counting. We seem to have a race condition somewhere.