Fixed an important bug whereby thread info wasn't being taken into
account for ! marks.

Also dramatically improved performance by getting rid of a silly O(n^2)
loop.