Tidied generated code up a little bit.