Cleaning up some static analyzer warnings.