Patch looks good, only a couple of comments: is this supposed to go?