Starting to work in moving all the token manipulation into TokenUtils,
added syncAST to work the new SrcSpans in to the AST so they tie up.
It will sort out indents and line spacing in future too