Minor tidy-up of AnnotMove.