I presume you closed this bug yourself because you decided it probably wasn't worth applying it?  I'm inclined to agree.  Cleaning up the code would be nice, but since the existing code works fine, changing it *just* to clean it up probably isn't worth the code churn or the chance of introducing an unexpected new bug.  

If we were also fixing a bug while doing the rewrite, it would be a different story.  So I'll try to keep this patch in mind if we have occasion to fix anything in that code.