More work on parsing the hazard analysis annotations