Fix some more bit-rot.