Since you don't seem to have pushed yet, here's an updated patche that
takes into account Nicolas' comments.