Updating: tidying-up ATS-parse-emit