propagate API change; and a few more API changes; and some cosmetics
Merge bug25495 (just as easy as junking, and it may do some good).