Finish the work begun in 0c68f559 to make scanning more thread-safe