Again fine but I think the public header should get a comment. I also think all these user-visible API changes merit NEWS items (perhaps several of them could be covered by a single item).