Yet another try to fix up tabbing.