Add support for tabs (-tabs) and arbitrary spaces (-spaces=N where N > 0).

Also removed unused newline var.