Wordlist.c fixes after merges.