Add benchmarks for 2.1 optimizations