Update code according to changes in upstream.