Reviewer Andy - Use Package rather than PackageSpec when determining diagnostic lists

Fixes #102