Move log2_ri and is_odd into util.h.
Eliminate unused block::merge function.