Code cleanup to remove compiler warnings.