Optimize focus thread collapsing workflow. Fixes #1143.