Fix line numbers being stored for the end of tokens, not the start