sure if they are all fixed, because rewriter is now the stumbling block,
but at least some cases work that did not work before.