BL-335: corpname and persname are getting clobbered