Seems like the "Theseus' ship" approach to RIIR worked wonders compared to a full rewrite.