Rearrange a little. Switch all ccalls to the new style.