Incorrect token columns reported on lines with macro argument expansions

[Hawkbat]

As reported by ISSOtm.

For example, the squiggles are off by one column here:

CH\1EchoBuffer:: ds ECHO_BUFFER_SIZE
                   ~~~~~~~~~~~~~~~~