Merge branch 'rs/xcalloc-takes-nelem-first'

Code cleanup.

* rs/xcalloc-takes-nelem-first:
  fix xcalloc() argument order

diff --cc add-interactive.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc trailer.c
Simple merge