Desugaring of +: for field name expressions incorrectly binds self

[sparkprime]

$ jsonnet -e '{ field: {accumulator: []} { [self.f] +: [1] }, f: "accumulator" }'
RUNTIME ERROR: Field does not exist: f
        <cmdline>:1:31-36       object <anonymous>
        <cmdline>:1:10-46       object <anonymous>
        During manifestation

Because the desugaring yields

{ field: {accumulator: []} { [self.f] : super[self.f] + [1] }, f: "accumulator" }

whereas it should yield something like

{ field: {accumulator: []} (local outer = self; { [self.f] : super[outer.f] + [1] }), f: "accumulator" }

[sparkprime]

Also super, which cannot be hoisted out to an 'outer' var so we'll have to hoist out at least every expression e in [e] +: ... where e contains self or super.