Fix non-assignment/call expression