Fix m_erase_branch_value bug. Continue to refine error detection and reporting.