Cosmetic changes to the model code.