Simplify List and Bounded listeners

Change-Id: I2ff5d90e3844caa0e49473b13eedc626cc9007a3