Another "rewrite"; let's salvage what's salvageable. This gonna be
a long process...