More fixes to placate clang.
More fixes to placate clang.

jorgemarsal/orc,jorgemarsal/orc,jorgemarsal/orc,jorgemarsal/orc,vertica/orc,vertica/orc,vertica/orc,vertica/orc,jorgemarsal/orc,jorgemarsal/orc,vertica/orc,vertica/orc,vertica/orc,jorgemarsal/orc,jorgemarsal/orc,vertica/orc