Wrap long lines; minor cleanup.