Created new classes, LabeledValue and LabeledValueSet to
provide a cleaner mechanism for defining the set of valid events
and states.  With this commit, events now use these new constructs.
The modifications to use these constructs for states will be done
as separate commit.

Some addtional, minor review comments were also addressed.