Clean up formatting inconsistencies from last merge.