A little cleanup in BlockPalette