Fix crash recently introduced.
Cleanup the old corpus-code
Cleanup
Missed a spot, from previous work
Additional fixes for the changed internals
Remove a pointlesssly duplicated field.