Minor BufQueue/Threads refactoring