Laying groundwork for C backend returning orig shapes.  Passes 63/64 tests with p12 failing under C.