Move callState dependency down the hierarchy