Fix the propagation of is-defined-ness through an OSR, though that exposes a number of other issues