Automate #593.  Sorry for the whitespace changes, but one of the top-level forms was indented wrong and emacs moved it.