Integration of Pierre's initial code review on bus/notificationQ.