Laura's changes.
Various polishing.
Merge in Laura's changes.
Draft to send to committee?  Probably -- I'll send it out in a couple of hours, in case I find a mistake between now and then.