Refactoring of alarm sensitive properties

Hi Xihui,

Here is the result of refactoring alarm sensitive properties. Adding alarm sensitive properties become reasonably easy without copying many lines. Please merge my branch back to 3.2.x.

Thanks,
 Takashi Nakamoto