Remaining changes to make dyn-waiton work well.