Get demo in line with all the recent API changes.