I'm not sure why the non-patron guarantor information needs to be in a separate collapsible section in memberentry.pl, but it is. It seems like this should be combined in some way. If not, CollapseFieldsPatronAddForm needs to include that section. Right now, you can not automatically collapse that section.