Loads of fix-ups to our module definitions

I suspected the performance -> eventlogging dependencies were wrong
and took the opportunity to fix all the things.

Change-Id: Ib97c2f2deb8c9bb3435ea6ce4fee440853381856
Merge "Loads of fix-ups to our module definitions"