Fix IObjectAddedEvent origine, clean-up old macro