More canqueue locking changes.