This is just a clean-up of the code.  Generated code is exactly the
same.