Use a root element; multiple perf enhancements