Simplify changes to List and Bounded Listeners

Change-Id: Icb2eecb75422c326d14bf90d270abaf036ea22ea