Apply spacing cleanup patch by Lunatrius