Small formatting fixes to fit into 80 columns.