Minor refactoring to remove compile warnings and possibly fix the Solaris test failures.
Attach a file by drag & drop or click to upload