Describe the block hierarchy a bit better.

Clean up some old cruft.
Formatting change.