Exploit Event class hierarchy when extracting properties

Between when the property extraction was written and now, the events
received a class hierarchy that allows to avoid DRY. We now take
advantage of that.

Change-Id: I95e102000e5096d69e2e64009b0e438777e5f709