Fix more positions for synthetics and remove auto added semicolons