Smarter subsampling, updated closure rules.