Merge pull request #215 from csmith/master

Make the formatter set the FG property for events.
Improve some optionals.