API changes, mostly cosmetic.