Add missing since tags
Get rid of an excessive MagicListener constructor paramater