Simplifying events macro - adding more property references