Minor changes in space-tab and trimming of leftovers