Remove the extra complexity for annotation update triggering