Moved wrapping logic to _make_catalog, inspired by Chris B

Untested. Completely untested.