TKD/Toad reshuffle

TKD still gives a fair amount of block-bonus for strong folks, but it's
not as guaranteed.