Revert "Revert "Attempt at a speedup for the collocation analyzer (testing now).""

Shit.

This reverts commit 4dc2ef7ba821249d7f8410a4aef5a0664aa9bfc7.