Minor cleanup to remove more compile warnings.