Integrate Cezary's changes, isarify wiv_mwov_singleton.