Finish renaming BasicBlock vars, remove another redundant field ( m_labelStr )