The <deprecated ...> </deprecated> are missing in doAddListener line 2340 and 2344?
Or should that not be in there in doRemoveListener() function in line 2362 and 2366?
I think the line must be removed from 'doRemoveListener' function.