I think we can merge this chunk of the patch. @traymond Opinions?