pkg2 wip: fix bug in scrubbing of fixed pkgs from requirements.

Also, fix pkg/types imports.