Fix code generation and diff test.

The generated code contained artifacts from the make
(some version of make were affected, others not).