minor oops, having forgotten to merge work->master and then pushed master.
Anywa, we recovered here.  Still need to add bit to TiConditional to not
regurgitate when in blocked mode.