More work to move towards new task synchronization model.