Major optimization

This optimizes several actual packages, so it needs tested
with a FULL build, not just of one or two packages.

Change-Id: If816b864076f983b774602e7e7241e2b1f0a424b