Move BLOCK_HGT, BLOCK_WID into dun_data