Fix issue #297. Light clean up here and there.

Package-Manager: portage-2.2.10