Fix the FIXME that was just added in r217390 - remove a bunch of redundant fold permu...