Cosmetic simplification of cpp11.cat