Improve perf of v2 state res for large rooms.