Re #10008. Fix doxygen and windows compiler warnings.