Fix removing duplicate recurring events.  Simplify JSON serialization
of entities.