Improved word extraction.