Oops, fixed, and I fixed other pre-existing long lines while at it.