intrinsic folding cleanups (and improvements.)