More migration to Google's event bus.
Code reformat.