Pkg.scaffold: some cosmitic changes to generated files.