Remove surplus empty lines and convert more files to new optional arg style.