Miscellaneous clean-up, mostly related to call-collect.

See individual commit messages.  Best reviewed one commit at a time !