Fix uninitialized-variable warnings induced by recent commit.