Fix issue #298 and major clean up. Funnilly enough OS X prefix was in slightly better shape.

Package-Manager: portage-2.2.10