Sprinkle more use of objects throughout events.