Reimplementing translator to work with new syntax