I'm reverting this change so it doesn't show up in the diff. @stefanv, both your comments are incorporated in the equivalent latex edit.