[551826] Simplify Package lookups to imported closure, one level nesting
3 files changed