cleaning up some of context2, using a simpler implementation for restricting resolved values (until the implementation is correct)
cleaning up some of context2, using a simpler implementation for restricting resolved values (until the implementation is correct)

gtfierro/hod,gtfierro/hod,gtfierro/hod,gtfierro/hod,gtfierro/hod,gtfierro/hod