Strip ws and untabify, part 2