HV-735 Properly tracking the tree-fold state of 'ignore-annotations'