Holiday Events no longer fire false alarms

Fixes #4597
Also fixes weird indentation