Fix non-pathological package shadowing

This is smelly more than anything but I should not have missed it
previously.