Update to match recent API changes for functions and data types.