Make canonicalization avoid ordering issues, don't generate assignments for local test