timer: Make sure timeout function is called with is_expired set
Move non-trivial helpers back to main
Add function to cleanup shown and expired notifications