Fix up WikiWord matching.