sync with EV fork ... "efficient" fock build works too.