Tidying up nml2 generated files