Mitigate compiler warnings from last patch.