stream: Override addListener as well as on

For the compatibility switch.