Fix calloc/malloc arguments.

The calloc fix is style, not correctness.  The malloc fix is
correctness.