Updating: reorganizing ATS-parse-emit