Perf improvement for H2 (closure).