Fix shady nesting of if's:
- Also tweak the loglevels while I'm at it.
Merge branch 'master' into event-notifications