Remove even more dependency cycles.