Hm. Made a few attempts at this, but could find anything that meaningfully reduced duplication without doing terrible things with inter-package visibility. I'm inclined to leave it for now, but will see if I can think of ways to de-dupe going forward.