Simplify tweaking params / codegen
Trying to fix, but not tested yet