Fix notification support in EddExpireAlarmService. Refactor codebase.