Comment 19 for bug 1354208

The patches look good to me. Thanks for addressing my comment!