Remove generic handling of folding and ranges