Patch looks good. I would have RTBC'd it, but not sure whether it needs tests.