Final Check-in

Discover and extra curly brace which did not cause any errors.  Also
fixes curly brace alignment and cleaned up doco a little more.