merge tidy-up

visible if alarm killed elsewhere