Fix unusual formatting and a few long lines.
Merge pull request #511 from cgay/conditions

Fix unusual formatting and a few long lines.