3 small regexps were responsible for pulling 3 packages into core-packages.

The new code should also do a better job of hiding
"call-clobbered register used" warnings.