Simplified a bit and fixed folding of long word tokens