TS-1820 Fix a build problem on Solaris.
Make more of the core compile on OmniOS.