Lots of little API changes.