This gets oo.t nearly working

11 failures out of ~800 tests with this patch.