Tidy up word list generation.