Mitigate compiler warnings from last patch.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Mitigate compiler warnings from last patch.