Revert Shape * -> HandleShape to match m-c