Finish bug 929 got rid of all references to folding, use narrowing instead.