Update code for Forestry API changes.