CC make supported calls more better

@dreid pointed out these were pointlessly verbose in another PR.