Clean-up of all TS event classes
Merge pull request #1287 from tschneidereit/nat

Clean-up of all TS event classes. r=mbx