Reapply my less-lock-contention-in-leak-detector patch, now with new files