Fix warnings about overly strict dependencies now.