Remove some hard-coding for Wikipedia; add some soft-coding to support WP and Wiktionary