Update FMS Event parsing. Fixes #873
Back out changes to consts.
Merge pull request #874 from gregmarra/fmsevents3

Update FMS Event parsing. Fixes #873