More cleanup around Blockable