Some minor clean-up in code related to call-collect.