Review fixes for formatting r=peterbe