I don't think we want to change rxgen. I guess I'll have to hold my nose and look the other way while someone fixes all callers to pass all 16 params.