Everything here is either package or protected visibility. Can `DeltaMessage` be made to be package visible?