Some clean-up (warnings/dead code) and some explanatory text.