MFC r310984,r311102:

r310984:

Use calloc instead of malloc + memset(.., 0, ..)

r311102 (by pfg):

Cleanup inelegant calloc(3) introduced in r310984.