Refine threading model a bit in hopes of catching a deadlock, and an issue w/ updating mobile entities.