More moving token management to TokenUtils. TypeUtils.addDecl
addTopLevelDecl now clean, must just manage token offsets in TokenUtils.