I made the suggested changes and submitted a modified version of the patch. Note: this goes back to bug 491289 from 2009.