Cleanup (again) the solaris topology code in hwloc...sigh.