Attempting to make this more Linux friendly.  That might break the Solaris
build, but that can be rectified easily enough.