Slip in a fix for Windows build warnings on mtc-generated code.