Update for upstream API changes.