Make generators be more Generic.