Issue 4951: Speed up collapse & expand.