Would be great if we had a more robust way of determining that we're looking at `ann`, but I assume that's one of the pain points you mentioned in the commit message. In any case, this patch is a definite improvement over the state of the art, so lgtm.