Start refactoring wait sets into common framework.
Refactor all waitsets.