Make multi subs not depend on auto-close.

Technically, still not quite right, but no worse than before.