Merge "EventHub code cleanup."