Merge of the folding-reimpl-branch.  Specific changes,

Remove a senseless comment.
1 file changed