Chris' inline-event changes.