*major* speed increase in reparsing