Removing dependence of etype attribute in tokens of input files, and fixing etype overwriting in output files