While successfully (mostly) fighting my urge to rewrite large swathes of it as I go.