Right, didn't want to make any changes to default generators and such since it isn't required for the basic, out-of-the-box plugin behavior, but I thought supporting extensibility and having at least light test coverage for it was worthwhile (I've done *a lot* more to support extensibility elsewhere, because I needed it, but it could use more tests before upstream submission).