Revert changes prompted only by gcc -Wjump-misses-init.