Updating checked in generated code to match what's actually generated

Fixing up some checked in code that has drifted a little from what's actually being generated.