Add CxxDeclaration and begin implementation of FileDeclaration
Fix incorrect tuple index
Avoid unnecessary wrappers for uninteresting tokens