FIxed #31 -- get the lineno correct for things that include a newline