Fix CG methods for new Hamiltonian stuff and fix expect_2s in uniform case.