Preserving call counts for re-required files
Instrumenter refactoring