Refresh patches after addressing review comments from bug 663740.