WIP on workaround for getRichTokenStream bug
Concept of workaround for CPP tokens proven.
Cleaning out some cruft
Added workaround to get rich token stream from CPP processed src.