Still more testing to do, but I want to get this panic fixed ASAP.

All new tests pass with -race