Small improvements on pairWordsBuffered