Avoid the use of lambda functions by ensuring _make_catalog is always given a list of structures.