Work on #49.

- Make sure shutdownHooks really get the specified time, and log if not.
- Whitespace fixes.