Beef up libgpg-error fix even more.