Reformatted to make lines <= 80 chars.

This is primarily to give meaningful diffs on update.