FYI - I just spotted while merging merging patch into trunk. I prefer being explicit (Zen of Python agrees with me) so I've changed it to explicitly return "None".