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

Rename a constant.
1 file changed