CLN: in common.py - revised _maybe_upcast to use _maybe_promote
     in rehashpe.py - removed block2d_to_block3d in favor of block2d_to_blocknd