There was a lot of duplicated code, some changes in the templates allows
to share the two generators.