Add modified version of Rob's proposal, with XML comments documenting my remarks.