Removing commented-out attempts at event squashing.
Fixing some issues with validation of metadata edits.