Refined 8d1135b9690fdfca5680aa94d20cadadd71048d0

I hadn't tested in a large enough thread. We also need to negate the
more comments/continue this thread links.
Merge pull request #688 from gavin19/master

Refined 8d1135b969