Cleanup incorrect unitialized variable warnings.