Squashed hydra-head 7 deprecations.