blake: get rid of separate state structures, and storing/restoring of said state