Latest and Greatest: looks like it's all fixed up and concurrent
modification should hopefully be a non-issue now. Let me know if it's
still a problem.