Get rid of the dirty hack re: initalizing the logger.
Fix a bug in 'await' which manifested in the AddRemoveSetTests (i1).