Cleanup here due to a major reorganization of fsf tree and the desire to keep the NetBSD tree as clean as possible.