Single archive support

Via #853 — for code review, and such.

PS. if no-one has any issues/warnings/etc by 15:00 UTC, I’m merging.