Various fixes.

Adjust whitespace; update type specifications to be correct.  Fix
documentation.