Update generator to format vals.