If it doe not affect speed or resources, I would vote for rewrite since the typing is approximately the same.  If any of these 3 are affected (speed, resource, or much more typing) then keep the same.  As far as documenting, this is where the question of "what is obvious" comes into play.  If too many comments are made for the sake of junior programmers, then the "important" comments get lost.