Clarifying code rearrangement and comments by David Abrahams. I've

got to admit that I haven't reviewed this carefully, but it looks okay
from 30,000 views, and doesn't break anything.  (SF patch 536407.)