Simplify event handler argument lists