Remove explicit dependencies on Addressable.