Code review changes to simplify concurrency stuff