SolidObject: cleanup the Block/UnBlock mess and FIXME