(#1533) - Reformat more lines to be < 80 char