Reimplemented BetterSorry using trylocks.

Wait-locks were too slow.