moved type decls to emit tokens different from const types