Fix Expand all being too damn slow.