Fixed parsing of assignments (again)