Couple new matchers and DRYd up ... generation code