OP-1170 Got rid of more compiler warnings.
Uncrustified the code.
OP-1170 One more compiler warning zapped.