Kris,
Here is that patch again, correct without any formatting or whitespace changes (white space was ignored in the diff). Let me know if this is better then the last one.
-Andy