Patch from Peter Cock. Allow overriding composite type main file in archives.
Fix default behavior of composite archival broken with previous changeset.

Other small tweaks this implementation.