Re-added (clean) support for multiple events per file.