Now 2.6 compatible: a rewritten assert rewriter

And, the assert rewriting is (I think?) now a good deal simpler, and I
think I will be able to maintain it better going into the future.