Finally found an insidious bug hiding in push/pop asymmetry with code stream.  Now we're testing it to make sure no matchers fail to clean up their pushes.