Fix compilation unit tracking through enclosingPackageClass