Fix #580: EventHandler names suggested by code completion should include the variable name/expression.