Move update of legacy arguments to generated code
Code clean up and comments
Change method name and clean up
Reduce code duplication
Reduce duplicated code, update callsite on mismatch