Mark - Improve alarm parsing.