Fix compilation.

Reverts a bit of 3c304097 (aggro was defined twice)
Merge pull request #520 from evktalo/master

Compilation fix