Fall back to our internal packaging if it is not supplied.

Also, shift towards less use of overlays.  Explicit arguments are better when
possible because they don't induce freaky action at a distance.