Re-introduce some partial evalCPU optimizations