More declarative special events
Christ almighty, take care of your warnings
Merge branch 'declared-events'