Remove some more dependency cycles.