Tweak last patch: Sync with gettext.