Fix edge case for folding.
Update submodules.