r6674: Fix some compiler warnings.