More mixed tabs/whitespace fixes.