initial auto-AST support for CPP target.
fixes to enable auto-AST extraction.