Improve nesting of related content in Event output.