RF: use _origshape rather than __origshape
RF+BK? rename .shape to .oshape property in FlattenMapper. XXX hopefully this will not break too many things