Detecting attacks only

In my map, one of the heroes has an ability that increases his damage for his next three attacks. I have it based off of Battle Roar, so that it triples it via the ability. I also have an integer that counts down as he attacks, and when it finishes counting down it removes the buff. The problem is, There's also a Item that adds a cleaving ability to heroes, and it makes it so that I can't use a simple Damage Detection event for it (It counts down for each unit hit, which isn't what I want). I need an event that will allow me to detect when he attacks a unit, that won't also go off for each unit cleaved to.

Incidentally, if anyone knows a way to have the "Cleaving Attacks" Ability on an item or a hero without it turning all his attack animations into "attack slam"?

Edit: I've actually just found the event "Is Attacked", so that may work.