catalog-generator: simplify