Fixed bug with event persistence. Updated to be consistent with new
event APIs.