This seems like we could unify the code by using the same string as the block type for both versions.  Do they have to be different, or are we just making the code strictly parallel to ceval.c?