Fixed advancing column numbers.

In a bunch of cases the column number would not be increased correctly.