Update for upstream lib/language changes.