Modified make-header-fields to use a utility function to break strings on a delimiter