Small cleanups; changes in verbose levels.