I think your patch looks fine, at least at visual inspection :-). It's definitely a better solution than my patch, so if you ask me, you should go ahead and commit it! 

(You might want to get rid of the last chunk, which is only a whitespace difference).