This time fix up tabbing without bungling everything.