Further Package Info optimizations