Minor changes. xmalloc declares xcalloc now.