Experimenting with making some impl classes package-only.