Improved line and column number handling.