Rework to accomodate Solaris and its ilk.